Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 22:05:30 +0000 (15:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 22:05:30 +0000 (15:05 -0700)
commit6f2531694a03f63ec4f9ca20f326f2705977a343
tree0a8c70a5600fce6497b6d893d9c8d8034f6a71f1
parent57b38744212ccdb89ba64ab201ae060d1f45d123
parente77f8379588bc53188f773755950d64f40f9e33d
Merge from trunk.